X-Git-Url: https://shimmer.witbreuk.eu/gitweb/UltimateKEYS.git/blobdiff_plain/8ce1871d7d8d472d1d6d87c4a98012be3f6247dc..bd7caaa9b413f373ae6715a59e3f9486152ff7b8:/autohotkey-v2.0/UltimateKEYS%20(for%20AutoHotkey%20v2.0).ahk?ds=sidebyside

diff --git a/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk b/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk
index 240994f..a8adf4b 100644
--- a/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk	
+++ b/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk	
@@ -1,4 +1,4 @@
-; UltimateKEYS (for AutoHotkey v2.0).ahk - 2022-05-28
+; UltimateKEYS (for AutoHotkey v2.0).ahk - 2022-06-02
 
 ; Website :  www.ultimatekeys.info (pieter-degroote.github.io/UltimateKEYS/)
 
@@ -279,7 +279,7 @@ cmpCedillaOgonek["."] := "{u+02db}"  ; (˛) ogonek
 cmpCedillaOgonek[" "] := "{u+00b8}"  ; (¸) cedilla
 
 
-; Compose :  Breve/Special (b)
+; Compose :  Breve and Special Letters (b)
 
 global cmpBreveSpecial := Map()
 cmpBreveSpecial["a"] := "{u+0103}"  ; (ă) a with breve
@@ -521,7 +521,7 @@ cmpHook["u"] := "{u+028a}"  ; (ʊ) latin small letter upsilon
 cmpHook["U"] := "{u+01b1}"  ; (Ʊ) latin capital letter upsilon
 
 
-; Compose :  Horn and Special Letters (H)
+; Compose :  Horn and Other Letters (H)
 
 global cmpHorn := Map()
 cmpHorn["o"] := "{u+01a1}"  ; (Æ¡) o with horn
@@ -786,6 +786,8 @@ cmpSymbols["V"] := "{u+2714}"  ; (✔) heavy check mark
 cmpSymbols["w"] := "{u+26a0}"  ; (⚠) warning sign
 cmpSymbols["x"] := "{u+2717}"  ; (✗) ballot x
 cmpSymbols["X"] := "{u+2718}"  ; (✘) heavy ballot x
+cmpSymbols["y"] := "{u+2713}"  ; (✓) check mark
+cmpSymbols["Y"] := "{u+2714}"  ; (✔) heavy check mark
 cmpSymbols["2"] := "{u+266b}"  ; (♫) beamed eighth notes
 cmpSymbols["3"] := "{u+2042}"  ; (⁂) asterism
 cmpSymbols["5"] := "{u+2605}"  ; (★) black star
@@ -931,25 +933,24 @@ cmpCapitalT["H"] := "{u+00de}"         ; (Þ) capital letter thorn
 
 ; Compose :  General/Math Symbols
 
+global cmpEight := Map()
 global cmpSmallN := Map()
 global cmpCapitalN := Map()
 global cmpCapitalP := Map()
 global cmpSmallR := Map()
+global cmpSemicolon := Map()
 global cmpAsterisk := Map()
 global cmpExclam := Map()
 global cmpQuestion := Map()
 global cmpParenLeft := Map()
 global cmpPercent := Map()
-global cmpEight := Map()
 global cmpLessThan := Map()
 global cmpGreaterThan := Map()
 global cmpBracketLeft := Map()
-cmpInvertedBreve["b"] := "{u+2022}"    ; (•) bullet
-cmpInvertedBreve["t"] := "{u+2023}"    ; (‣) triangular bullet
-cmpInvertedBreve["h"] := "{u+2043}"    ; (⁃) hyphen bullet
-cmpInvertedBreve["w"] := "{u+25e6}"    ; (◦) white bullet
 cmpSmallD["d"] := "{u+2020}"           ; (†) dagger
 cmpCapitalD["D"] := "{u+2021}"         ; (‡) double dagger
+cmpSmallI["i"] := "{u+221e}"           ; (∞) infinity symbol
+cmpEight["8"] := "{u+221e}"            ; (∞) infinity symbol
 cmpMathSymbols["i"] := "{u+00b5}"      ; (µ) micro sign
 cmpSmallN["o"] := "{u+2116}"           ; (№) numero sign
 cmpCapitalN["o"] := "{u+2116}"         ; (№) numero sign
@@ -962,6 +963,11 @@ cmpSmallR["4"] := "{u+221c}"           ; (∜) fourth root
 cmpSymbols["o"] := "{u+00a7}"          ; (§) section sign
 cmpPlayingCardSuit["o"] := "{u+00a7}"  ; (§) section sign
 cmpTurned["m"] := "{u+2122}"           ; (™) trademark symbol
+cmpSemicolon["b"] := "{u+2022}"        ; (•) bullet
+cmpSemicolon[";"] := "{u+2022}"        ; (•) bullet
+cmpSemicolon["t"] := "{u+2023}"        ; (‣) triangular bullet
+cmpSemicolon["h"] := "{u+2043}"        ; (⁃) hyphen bullet
+cmpSemicolon["w"] := "{u+25e6}"        ; (◦) white bullet
 cmpAcuteAccent["1"] := "{u+2032}"      ; (′) prime
 cmpAcuteAccent["2"] := "{u+2033}"      ; (″) double prime
 cmpAcuteAccent["3"] := "{u+2034}"      ; (‴) triple prime
@@ -987,10 +993,8 @@ cmpPlus["-"] := "{u+00b1}"             ; (±) plus-minus sign
 cmpPercent["%"] := "{u+2030}"          ; (‰) per mille sign
 cmpPercent["3"] := "{u+2030}"          ; (‰) per mille sign
 cmpPercent["4"] := "{u+2031}"          ; (‱) per ten thousand sign
-cmpEight["8"] := "{u+221e}"            ; (∞) infinity symbol
 cmpExclam["="] := "{u+2260}"           ; (≠) not equal to
-cmpDoubleAcute["/"] := "{u+2260}"      ; (≠) not equal to
-cmpStroke["="] := "{u+2260}"           ; (≠) not equal to
+cmpLessThan[">"] := "{u+2260}"         ; (≠) not equal to
 cmpLessThan["="] := "{u+2264}"         ; (≤) less-than or equal to
 cmpGreaterThan["="] := "{u+2265}"      ; (≥) greater-than or equal to
 cmpLessThan["+"] := "{u+2a7d}"         ; (⩽) less-than or slanted equal to
@@ -1420,42 +1424,42 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
     Send "{u+00db}"  ; (Û) U with circumflex
 }
 
->!-:: {
+>!6:: {
   if GetKeyState("CapsLock", "T")
     Send "{u+00c3}"  ; (Ã) A with tilde
   else
     Send "{u+00e3}"  ; (ã) a with tilde
 }
->!_:: {
+>!+6:: {
   if GetKeyState("CapsLock", "T")
     Send "{u+00e3}"  ; (ã) a with tilde
   else
     Send "{u+00c3}"  ; (Ã) A with tilde
 }
 
->!=:: {
+>!7:: {
   if GetKeyState("CapsLock", "T")
     Send "{u+00d5}"  ; (Õ) O with tilde
   else
     Send "{u+00f5}"  ; (õ) o with tilde
 }
->!+=:: {
+>!+7:: {
   if GetKeyState("CapsLock", "T")
     Send "{u+00f5}"  ; (õ) o with tilde
   else
     Send "{u+00d5}"  ; (Õ) O with tilde
 }
 
->!m::Send "{u+00b5}"   ; (µ) micro sign
+>!m::Send "{u+2030}"   ; (‰) per mille sign
 >!+m::Send "{u+00b1}"  ; (±) plus-minus sign
 
 >!1::Send "{u+00a1}"   ; (¡) inverted exclamation mark
 >!+1::Send "{u+00b9}"  ; (¹) superscript 1
 
->!2::Send "{u+2013}"   ; (–) en dash
+>!2::Send "{u+2264}"   ; (≤) less-than or equal to
 >!+2::Send "{u+00b2}"  ; (²) superscript 2
 
->!3::Send "{u+2014}"   ; (—) em dash
+>!3::Send "{u+2265}"   ; (≥) greater-than or equal to
 >!+3::Send "{u+00b3}"  ; (³) superscript 3
 
 >!4::Send "{u+00a3}"   ; (£) pound sign
@@ -1464,14 +1468,8 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
 >!5::Send "{u+20ac}"   ; (€) euro sign
 >!+5::Send "{u+00a2}"  ; (¢) cent sign (dollar)
 
->!6::Send "{u+2264}"   ; (≤) less-than or equal to
->!+6::Send "{u+2260}"  ; (≠) not equal to
-
->!7::Send "{u+2265}"   ; (≥) greater-than or equal to
->!+7::Send "{u+2248}"  ; (≈) almost equal to
-
 >!8::Send "{u+201e}"   ; („) double low-9 quotation mark
->!+8::Send "{u+201a}"  ; (‚) single low-9 quotation mark
+>!+8::Send "{u+00a7}"  ; (§) section sign
 
 >!9::Send "{u+201c}"   ; (“) left double quotation mark
 >!+9::Send "{u+2018}"  ; (‘) left single quotation mark
@@ -1479,6 +1477,12 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
 >!0::Send "{u+201d}"   ; (”) right double quotation mark
 >!+0::Send "{u+2019}"  ; (’) right single quotation mark
 
+>!-::Send "{u+2013}"   ; (–) en dash
+>!_::Send "{u+2014}"   ; (—) em dash
+
+>!=::Send "{u+00d7}"   ; (×) multiplication sign
+>!+=::Send "{u+00f7}"  ; (÷) division sign
+
 >![::Send "{u+00ab}"   ; («) left-pointing double angle quotation mark
 >!{::Send "{u+2039}"   ; (‹) left-pointing single angle quotation mark
 
@@ -1488,11 +1492,11 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
 >!;::Send "{u+00b0}"   ; (°) degree sign
 >!+;::Send "{u+00b7}"  ; (·) middle dot
 
->!'::Send "{u+00d7}"   ; (×) multiplication sign
->!+'::Send "{u+00f7}"  ; (÷) division sign
+>!'::Send "{u+2020}"   ; (†) dagger
+>!+'::Send "{u+2021}"  ; (‡) double dagger
 
->!\::Send "{u+00a7}"   ; (§) section sign
->!|::Send "{u+2030}"   ; (‰) per mille sign
+>!\::Send "{u+2002}"   ;     en space
+>!|::Send "{u+2003}"   ;     em space
 
 >!/::Send "{u+00bf}"   ; (¿) inverted question mark
 >!?::Send "{u+2026}"   ; (…) horizontal ellipsis
@@ -1705,6 +1709,10 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
     if cmpSmallR.Has(ihB.Input)
       Send cmpSmallR[ihB.Input]
   }
+  else if (ihA.Input == ";") {
+    if cmpSemicolon.Has(ihB.Input)
+      Send cmpSemicolon[ihB.Input]
+  }
   else if (ihA.Input == "*") {
     if cmpAsterisk.Has(ihB.Input)
       Send cmpAsterisk[ihB.Input]